Do not lose payload data when locals is given.

Akinori MUSHA 10 years ago
parent
commit
f722d646b7
1 changed files with 1 additions and 1 deletions
  1. 1 1
      app/models/event.rb

+ 1 - 1
app/models/event.rb

@@ -45,7 +45,7 @@ end
45 45
 
46 46
 class EventDrop
47 47
   def initialize(object, locals = nil)
48
-    locals ||= object.payload
48
+    locals = object.payload.merge(locals || {})
49 49
     super
50 50
   end
51 51